Merge version 5.11.2+dfsg-7+rpi1 and 5.11.3+dfsg-2 to produce 5.11.3+dfsg-2+rpi1

diff --cc debian/changelog
index 823bf6ebdb7436357e5a65130ed0a86811ce26e7,c92db2b04e22ee0c6c88a92bf3d995da99b1ee0c..c3d1e357f354dd3004e71cf8c87fe9b622f2649b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,53 +1,63 @@@
- qtbase-opensource-src (5.11.2+dfsg-7+rpi1) buster-staging; urgency=medium
++qtbase-opensource-src (5.11.3+dfsg-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 28 Nov 2018 00:58:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Jan 2019 00:12:44 +0000
++
+ qtbase-opensource-src (5.11.3+dfsg-2) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Note that the previous upload fixes:
+     - CVE-2018-15518: “double free or corruption” in QXmlStreamReader
+     - CVE-2018-19873: QBmpHandler segfault on malformed BMP file
+     - CVE-2018-19870: Check for QImage allocation failure in qgifhandler
+ 
+   [ Simon Quigley ]
+   * Change my email to tsimonq2@debian.org now that I am a Debian Developer.
+   * Bump Standards-version to 4.3.0, no changes needed.
+ 
+   [ Dmitry Shachnev ]
+   * Use $(MAKE) instead of make in debian/rules for parallelization.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Wed, 26 Dec 2018 16:06:23 -0300
+ 
+ qtbase-opensource-src (5.11.3+dfsg-1) experimental; urgency=medium
+ 
+   * Revert the switch of arm64 to OpenGL ES as a result of
+     <https://lists.debian.org/debian-devel/2018/11/msg00457.html>
+   * New upstream release.
+     - Bump Qt build dependencies.
+     - Bump qtbase-abi to 5-11-3.
+   * Fix typo in previous changelog entry.
+   * Delete dont_get_screen_rotation.diff, already applied upstream.
+   * Refresh patches.
+   * Delete ssl_max_version.diff. Applied upstream with some changes.
+   * Create and apply revert_remove_our_use_of_syscall_for-statx.patch. This is
+     needed for Qt to work with Stretch machines running testing/unstable
+     chroots but Stretch's kernel.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Wed, 05 Dec 2018 20:54:37 -0300
+ 
+ qtbase-opensource-src (5.11.2+dfsg-8) experimental; urgency=medium
+ 
+   * Switch arm64 to use OpenGL ES instead of desktop OpenGL (Closes: #881333).
+     - Rename libqt5gui5 to libqt5gui5a.
+       - Add Breaks+Replaces against libqt5gui5 << 5.11.2+dfsg-8~. This
+         avoids co-installation of the library.
+       - Change all related dependencies to new binary name.
+       - Add a lintian override for package name does not match soname warning.
+     - Adjust arch qualifications for required packages.
+     - debian/rules: add arm64 to gles2_architectures.
+     - Rename debian/libqt5gui5 files to their libqt5gui5a counterparts,
+       modifying them when necessary.
+     - Update symbols files arch qualifications accordingly.
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Tue, 20 Nov 2018 20:24:04 -0300
  
  qtbase-opensource-src (5.11.2+dfsg-7) unstable; urgency=medium
  

diff --cc debian/patches/series
index 08c96450be34b4df5edab3998f0ff182ace01c45,12645f82c91d04380951a3f6c5368af0f0a9d445..f4e2533a75ded96b19f14d10f4c3970bf5ba1cd7
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -16,5 -15,4 +15,5 @@@ no_arc4random_buf.dif
  qdoc_default_incdirs.diff
  kfreebsd_qstrncpy.diff
  alpha_atimensec.diff
+ revert_remove_our_use_of_syscall_for-statx.patch
 +modify-configure.json-to-disable-neon.patch

diff --cc debian/rules
Simple merge